diff --git a/docker-compose.yml b/docker-compose.yml index b8f76bb..cb3fb0b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,6 @@ services: backend: ipv4_address: 10.5.0.5 - app: build: context: ./src @@ -25,6 +24,7 @@ services: ipv4_address: 10.5.0.6 networks: + backend: driver: bridge ipam: diff --git a/mysql/sql/init.sql b/mysql/sql/init.sql index 89ef7bd..c27a059 100644 --- a/mysql/sql/init.sql +++ b/mysql/sql/init.sql @@ -1,12 +1,12 @@ CREATE TABLE `db`.`users` ( - 'id' INT AUTO_INCREMENT PRIMARY KEY, + `userid` INT AUTO_INCREMENT, `username` VARCHAR(45) NULL, `password` VARCHAR(45) NULL, - ); + PRIMARY KEY (`userid`)); -insert into users values ("admin", "password"); -insert into users values ("bernt", "inge"); +insert into users values (NULL, "admin", "password"); +insert into users values (NULL, "bernt", "inge"); CREATE USER 'root'@'10.5.0.6' IDENTIFIED BY 'root'; GRANT ALL PRIVILEGES ON db.* TO 'root'@'10.5.0.6'; diff --git a/src/app/main.py b/src/app/main.py index 93dce6f..5bfade4 100644 --- a/src/app/main.py +++ b/src/app/main.py @@ -91,7 +91,7 @@ class register: # Register new user in database def POST(self): cursor = db.cursor() - query = ("INSERT INTO users VALUES ((%s), (%s))") + query = ("INSERT INTO users VALUES (NULL, (%s), (%s))") data = web.input() cursor.execute(query, (data.username, data.password)) cursor.close() diff --git a/src/app/templates/index.html b/src/app/templates/index.html index 68d58bb..6ac6cc3 100644 --- a/src/app/templates/index.html +++ b/src/app/templates/index.html @@ -14,7 +14,8 @@ $def with (login_form, friends) Friends
- Become A Friend +
+ Become A Friend!

Log In