Fix conflict
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- app/controller/user/AuthMiddleware.php 14 additions, 3 deletionsapp/controller/user/AuthMiddleware.php
- app/controller/user/UserDb.php 12 additions, 0 deletionsapp/controller/user/UserDb.php
- app/controller/user/UserUsecase.php 17 additions, 2 deletionsapp/controller/user/UserUsecase.php
- app/controller/user/routes.php 1 addition, 1 deletionapp/controller/user/routes.php
- app/view/browse.php 6 additions, 0 deletionsapp/view/browse.php
- app/view/history.php 3 additions, 3 deletionsapp/view/history.php
- app/view/login.php 4 additions, 0 deletionsapp/view/login.php
- app/view/logout.php 14 additions, 0 deletionsapp/view/logout.php
- app/view/profile.php 3 additions, 4 deletionsapp/view/profile.php
- app/view/register.php 4 additions, 0 deletionsapp/view/register.php
- app/view/static/css/header.css 0 additions, 36 deletionsapp/view/static/css/header.css
- app/view/static/css/search_result.css 18 additions, 0 deletionsapp/view/static/css/search_result.css
- app/view/static/html/header.html 0 additions, 19 deletionsapp/view/static/html/header.html
- app/view/static/html/search_result.html 3 additions, 0 deletionsapp/view/static/html/search_result.html
- public/colorcodes.txt 0 additions, 0 deletionspublic/colorcodes.txt
- public/index.php 17 additions, 8 deletionspublic/index.php
- public/static/css/base.css 0 additions, 1 deletionpublic/static/css/base.css
- public/static/css/header.css 77 additions, 0 deletionspublic/static/css/header.css
- public/static/css/login.css 65 additions, 0 deletionspublic/static/css/login.css
Please register or sign in to comment