Rearrange directories

jak103 · May 29, 2020 · f4f6bd8 · f4f6bd8
1 parent 1416025
commit f4f6bd8
Show file tree

Hide file tree

Showing 33 changed files with 9,885 additions and 27 deletions.
diff --git a/server/README.txt → README.txt b/server/README.txt → README.txt
diff --git a/server/web/.browserslistrc → client/.browserslistrc b/server/web/.browserslistrc → client/.browserslistrc
diff --git a/server/web/.eslintrc.js → client/.eslintrc.js b/server/web/.eslintrc.js → client/.eslintrc.js
diff --git a/server/web/README.md → client/README.md b/server/web/README.md → client/README.md
diff --git a/server/web/babel.config.js → client/babel.config.js b/server/web/babel.config.js → client/babel.config.js
diff --git a/server/web/public/favicon.ico → client/dist/favicon.ico b/server/web/public/favicon.ico → client/dist/favicon.ico
diff --git a/client/dist/index.html b/client/dist/index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="favicon.ico">
+    <title>frontend</title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
+  <link href="/js/about.js" rel="prefetch"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"></head>
+  <body>
+    <noscript>
+      <strong>We're sorry but frontend doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  <script type="text/javascript" src="/js/chunk-vendors.js"></script><script type="text/javascript" src="/js/app.js"></script></body>
+</html>
diff --git a/client/dist/js/about.js b/client/dist/js/about.js
diff --git a/client/dist/js/app.js b/client/dist/js/app.js
diff --git a/client/dist/js/chunk-vendors.js b/client/dist/js/chunk-vendors.js
diff --git a/server/web/package-lock.json → client/package-lock.json b/server/web/package-lock.json → client/package-lock.json
diff --git a/server/web/package.json → client/package.json b/server/web/package.json → client/package.json
diff --git a/client/public/favicon.ico b/client/public/favicon.ico
diff --git a/server/web/public/index.html → client/public/index.html b/server/web/public/index.html → client/public/index.html
diff --git a/server/web/src/App.vue → client/src/App.vue b/server/web/src/App.vue → client/src/App.vue
diff --git a/server/web/src/assets/logo.png → client/src/assets/logo.png b/server/web/src/assets/logo.png → client/src/assets/logo.png
diff --git a/server/web/src/assets/logo.svg → client/src/assets/logo.svg b/server/web/src/assets/logo.svg → client/src/assets/logo.svg
diff --git a/server/web/src/components/Card.vue → client/src/components/Card.vue b/server/web/src/components/Card.vue → client/src/components/Card.vue
diff --git a/server/web/src/components/HelloWorld.vue → client/src/components/HelloWorld.vue b/server/web/src/components/HelloWorld.vue → client/src/components/HelloWorld.vue
diff --git a/server/web/src/components/Login.vue → client/src/components/Login.vue b/server/web/src/components/Login.vue → client/src/components/Login.vue
diff --git a/server/web/src/main.js → client/src/main.js b/server/web/src/main.js → client/src/main.js
diff --git a/server/web/src/plugins/vuetify.js → client/src/plugins/vuetify.js b/server/web/src/plugins/vuetify.js → client/src/plugins/vuetify.js
diff --git a/server/web/src/router/index.js → client/src/router/index.js b/server/web/src/router/index.js → client/src/router/index.js
diff --git a/server/web/src/views/About.vue → client/src/views/About.vue b/server/web/src/views/About.vue → client/src/views/About.vue
diff --git a/server/web/src/views/Home.vue → client/src/views/Home.vue b/server/web/src/views/Home.vue → client/src/views/Home.vue
diff --git a/server/web/vue.config.js → client/vue.config.js b/server/web/vue.config.js → client/vue.config.js
diff --git a/server/docker-compose.yml → docker-compose.yml b/server/docker-compose.yml → docker-compose.yml
@@ -1,12 +1,22 @@
 version: '3.6'
 
 services:
-  dev:
+  client:
+    image: node:12-slim
+    working_dir: /client
+    volumes:
+      - ./client:/client      
+    command:
+      npm run-script build-watch
+    environment:
+      NODE_ENV: development
+
+  server:
     image: golang:1.14.2
     container_name: golang
-    working_dir: /code
+    working_dir: /server
     volumes:
-      - .:/code
+      - ./server:/server
     command: bash -c "sleep infinity"
 
   db:

diff --git a/server/firebase/Dockerfile → firebase/Dockerfile b/server/firebase/Dockerfile → firebase/Dockerfile
diff --git a/server/firebase/firebase.json → firebase/firebase.json b/server/firebase/firebase.json → firebase/firebase.json
diff --git a/server/main.go b/server/main.go
@@ -10,20 +10,19 @@ import (
 func main() {
 	fmt.Println("USU - UNO v0.0.0")
 
-
 	// New Echo server
 	e := echo.New()
 
 	// Setup middleware
-	e.File("/", "web/dist/index.html")	
+	e.File("/", "/client/dist/index.html")
 
 	e.Use(middleware.Gzip())
 	e.Use(middleware.Recover())
 
 	e.Use(middleware.StaticWithConfig(middleware.StaticConfig{
-		Root:   "web/dist",
+		Root:  "/client/dist",
 		HTML5: true,
-	  }))
+	}))
 
 	// Setup routes
 	setupRoutes(e)

diff --git a/server/uno.go b/server/uno.go
@@ -1,30 +1,29 @@
 package main
 
 import (
-	"github.com/labstack/echo"
 	"math/rand"
-)
 
+	"github.com/labstack/echo"
+)
 
 ////////////////////////////////////////////////////////////
 // Structs used for the talking with frontend
 ////////////////////////////////////////////////////////////
 type Response struct {
-	ValidGame bool 				   `json:"valid"`  // Valid game id
-	Payload map[string]interface{} `json:"payload"`
+	ValidGame bool                   `json:"valid"` // Valid game id
+	Payload   map[string]interface{} `json:"payload"`
 }
 
 type Card struct {
-	Number int 	 `json:"number"`
-	Color string `json:"color"`
+	Number int    `json:"number"`
+	Color  string `json:"color"`
 }
 
-
 ////////////////////////////////////////////////////////////
 // Utility functions used in place of firebase
 ////////////////////////////////////////////////////////////
 func randColor(i int) string {
-	switch (i) {
+	switch i {
 	case 0:
 		return "red"
 	case 1:
@@ -37,39 +36,36 @@ func randColor(i int) string {
 	return ""
 }
 
-
 ////////////////////////////////////////////////////////////
 // All the data needed for a simulation of the game
 // eventually, this will be replaced with firebase
 ////////////////////////////////////////////////////////////
 var gameID string = ""
-var currCard []Card = nil   // The cards are much easier to render as a list
+var currCard []Card = nil // The cards are much easier to render as a list
 var players []string = []string{}
-var playerIndex = 0  // Used to iterate through the players
+var playerIndex = 0 // Used to iterate through the players
 var currPlayer string = ""
 var allCards map[string][]Card = make(map[string][]Card) // k: username, v: list of cards
 var gameStarted bool = false
 
-
 ////////////////////////////////////////////////////////////
 // Utility functions
 ////////////////////////////////////////////////////////////
 func newRandomCard() []Card {
-	return []Card{Card{rand.Intn(9), randColor(rand.Intn(3))}}
+	return []Card{Card{rand.Intn(10), randColor(rand.Intn(4))}}
 }
 
 func newPayload(user string) map[string]interface{} { // User will default to "" if not passed
 	payload := make(map[string]interface{})
 
-	// Update known variables 
+	// Update known variables
 	payload["current_card"] = currCard
 	payload["current_player"] = currPlayer
 	payload["all_players"] = players
 	payload["deck"] = allCards[user] // returns nil if currPlayer = "" or user not in allCards
 	payload["game_id"] = gameID
 	payload["game_over"] = checkForWinner()
 
-
 	return payload
 }
 
@@ -86,7 +82,6 @@ func contains(arr []string, val string) (int, bool) {
 	return -1, false
 }
 
-
 ////////////////////////////////////////////////////////////
 // These are all of the functions for the game -> essentially public functions
 ////////////////////////////////////////////////////////////
@@ -112,12 +107,12 @@ func joinGame(c echo.Context) *Response {
 		}
 		return &Response{true, newPayload(c.Param("username"))}
 	}
-	return &Response{false, nil}  // bad game_id
+	return &Response{false, nil} // bad game_id
 }
 
 func playCard(c echo.Context, card Card) *Response {
 	if checkID(c.Param("game")) && currPlayer == c.Param("username") {
-		if card.Color == currCard[0].Color || card.Number == currCard[0].Number { 
+		if card.Color == currCard[0].Color || card.Number == currCard[0].Number {
 			// Valid card can be played
 			playerIndex = (playerIndex + 1) % len(players)
 			currPlayer = players[playerIndex]
@@ -157,12 +152,12 @@ func dealCards() {
 	for k := range players {
 		cards := []Card{}
 		for i := 0; i < 7; i++ {
-			cards = append(cards, Card{rand.Intn(9), randColor(rand.Intn(3))})
+			cards = append(cards, Card{rand.Intn(10), randColor(rand.Intn(4))})
 		}
 		allCards[players[k]] = cards
 	}
 
-	currCard = newRandomCard()	
+	currCard = newRandomCard()
 }
 
 // TODO: make sure this reflects on the front end

diff --git a/server/static/index.html → static/index.html b/server/static/index.html → static/index.html
diff --git a/server/static/test.js → static/test.js b/server/static/test.js → static/test.js