+! More fixing of dev dependencies

.gitignore

@@ -7,6 +7,7 @@ api/target/
 api/dev/
 api/vids/
 api/static/js/
+api/static/dist/
 api/thumbs/
 api/*.db
 
@@ -25,3 +26,4 @@ aws/infra/terraform.tfvars
 aws/playbooks/hosts
 
 ts/dist/
+ts/node_modules/

.gitlab-ci.yml

@@ -7,6 +7,9 @@ stages:
 pages:
   image: shockrah/website:latest
   stage: pages
+  only:
+    refs:
+      - master
   before_script:
     - git submodule init
     - git submodule update
@@ -22,6 +25,10 @@ pages:
 build-frontend-js:
   image: codesignal/typescript:v9.6.0
   stage: build-frontend
+  stage: pages
+  only:
+    refs:
+      - master
   script:
     - cd ts/
     - npm run setup
@@ -36,6 +43,10 @@ build-frontend-js:
 build-server-binaries:
   image: rustlang/rust:nightly
   stage: build-backend
+  stage: pages
+  only:
+    refs:
+      - master
   script:
     - mkdir -p build
     - cp api/templates/ api/static/ build/ -r 

api/src/main.rs

@@ -34,7 +34,7 @@ async fn main() {
             .mount("/api", routes![category::list, video::list]) // json
             .mount("/thumbnail", routes![thumbnail::get]) // images
             .mount("/video", routes![video::get_video]) // videos
-            .mount("/admin?", routes![
+            .mount("/admin", routes![
               admin::login_dashboard, 
               admin::dashboard
             ])

ts/package.json

@@ -1,12 +1,12 @@
 {
   "name": "ts",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Frontend scripts built out for clippable's frontend",
-  "main": "index.js",
+  "main": "main.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "npm exec eslint .",
-    "setup": "mkdir -p api/static/js",
+	"build": "webpack",
-    "build": "tsc"
+    "build-dev": "webpack && cp -r dist/ ../api/static/"
   },
   "repository": {
     "type": "git",
@@ -20,5 +20,8 @@
     "eslint": "^8.11.0",
     "ts-loader": "^9.2.8",
     "tslib": "^2.3.1"
+  },
+  "devDependencies": {
+    "webpack-cli": "^4.9.2"
   }
 }