feat(web-service): delete tailwind and use scss

Onyxmoon · Oct 31, 2023 · d864fdf · d864fdf
1 parent 1b9eac0
commit d864fdf
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 889 deletions.
diff --git a/src/web-service/frontend/package-lock.json b/src/web-service/frontend/package-lock.json
diff --git a/src/web-service/frontend/package.json b/src/web-service/frontend/package.json
@@ -10,10 +10,8 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
-    "autoprefixer": "^10.4.16",
-    "postcss": "^8.4.31",
+    "sass": "^1.69.5",
     "svelte": "^4.0.5",
-    "tailwindcss": "^3.3.5",
     "vite": "^4.4.5"
   }
 }
diff --git a/src/web-service/frontend/postcss.config.js b/src/web-service/frontend/postcss.config.js
diff --git a/src/web-service/frontend/src/App.svelte b/src/web-service/frontend/src/App.svelte
@@ -1,7 +1,15 @@
-<script>
+<script >
   console.log('hallo');
 </script>
 
 <main>
-  <p class="text-green-dark">Test</p>
-</main>
+  <p class="headline">Test</p>
+</main>
+
+<style lang="scss">
+  @import "./styles/fonts";
+
+  .headline {
+    color: red;
+  }
+</style>
diff --git a/src/web-service/frontend/src/assets/fonts/Manrope-Bold.ttf b/src/web-service/frontend/src/assets/fonts/Manrope-Bold.ttf
diff --git a/src/web-service/frontend/src/assets/fonts/Manrope-Medium.ttf b/src/web-service/frontend/src/assets/fonts/Manrope-Medium.ttf
diff --git a/src/web-service/frontend/src/assets/fonts/Manrope-Regular.ttf b/src/web-service/frontend/src/assets/fonts/Manrope-Regular.ttf
diff --git a/src/web-service/frontend/src/assets/fonts/Manrope-SemiBold.ttf b/src/web-service/frontend/src/assets/fonts/Manrope-SemiBold.ttf
diff --git a/src/web-service/frontend/src/css/styles.css b/src/web-service/frontend/src/css/styles.css
diff --git a/src/web-service/frontend/src/main.js b/src/web-service/frontend/src/main.js
@@ -1,4 +1,3 @@
-import './css/styles.css'
 import App from './App.svelte'
 
 const app = new App({

diff --git a/src/web-service/frontend/src/css/fonts.css → ...eb-service/frontend/src/styles/fonts.scss b/src/web-service/frontend/src/css/fonts.css → ...eb-service/frontend/src/styles/fonts.scss
@@ -1,31 +1,31 @@
 /* Load fonts */
 @font-face{
     font-family: 'Manrope';
-    src: url('/src/web-service/frontend/public/fonts/Manrope-Regular.ttf') format('ttf');
+    src: url('./assets/fonts/Manrope-Regular.ttf') format('ttf');
     font-weight: normal;
     font-style: normal;
     font-display: swap;
 }
 
 @font-face{
     font-family: 'Manrope';
-    src: url('/src/web-service/frontend/public/fonts/Manrope-Medium.ttf') format('ttf');
+    src: url('./assets/fonts/Manrope-Medium.ttf') format('ttf');
     font-weight: 500;
     font-style: normal;
     font-display: swap;
 }
 
 @font-face{
     font-family: 'Manrope';
-    src: url('/src/web-service/frontend/public/fonts/Manrope-SemiBold.ttf') format('ttf');
+    src: url('./assets/fonts/Manrope-SemiBold.ttf') format('ttf');
     font-weight: 600;
     font-style: normal;
     font-display: swap;
 }
 
 @font-face{
     font-family: 'Manrope';
-    src: url('/src/web-service/frontend/public/fonts/Manrope-Bold.ttf') format('ttf');
+    src: url('./assets/fonts/Manrope-Bold.ttf') format('ttf');
     font-weight: bold;
     font-style: normal;
     font-display: swap;

diff --git a/src/web-service/frontend/tailwind.config.js b/src/web-service/frontend/tailwind.config.js
diff --git a/src/web-service/main.go b/src/web-service/main.go
@@ -27,7 +27,7 @@ func indexHandler(tmpl *template.Template) http.HandlerFunc {
 
 func getFilesOutManifestJson() (string, string) {
 	data := map[string]struct {
-		CSS     []string `json:"css"`
+		CSS     []string `json:"styles"`
 		File    string   `json:"file"`
 		IsEntry bool     `json:"isEntry"`
 		Src     string   `json:"src"`
@@ -52,6 +52,7 @@ func main() {
 	r.GET("/static/assets/main.js", func(w http.ResponseWriter, r *http.Request) {
 		http.ServeFile(w, r, "frontend/public/"+jsFile)
 	})
+
 	r.GET("/static/assets/main.css", func(w http.ResponseWriter, r *http.Request) {
 		http.ServeFile(w, r, "frontend/public/"+cssFile)
 	})