Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Map #340

Open
wants to merge 80 commits into
base: main
Choose a base branch
from
Open

Map #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
119ef41
Last version
Meiruz Nov 29, 2023
8c9b486
update sc machine
nepalette Nov 29, 2023
e749a96
stuctured cities
nepalette Nov 30, 2023
8cd854c
Add FindSomePlaces, but there are errors
Meiruz Nov 29, 2023
9ad2370
FindSomePlaces2
Meiruz Nov 29, 2023
9ab09ca
Desire Knowledge Base
Meiruz Nov 30, 2023
818e73c
Travelling vix
Meiruz Nov 30, 2023
a379de7
Add knowledge_cities folder
Meiruz Dec 3, 2023
e6b4bd1
fix(kb): duplicate wit ai classes for city instances
NikitaZotov Dec 4, 2023
b4112d1
fix(solver): compatible with kb
NikitaZotov Dec 4, 2023
d66d726
Idk how fix FindSomePlacesAgent
Meiruz Dec 4, 2023
0fe6860
I fix all bags and i am cool
Meiruz Dec 4, 2023
cd1a719
(FIX) Agents, HistoryAgent works
Meiruz Dec 5, 2023
8f21418
New design of system
Meiruz Dec 5, 2023
32219fd
(FIX) Last Version Merge
Meiruz Dec 5, 2023
2550a6a
Merge pull request #1 from Meiruz/last_version
Meiruz Dec 5, 2023
fcc1d7f
Subject domains have added for users and desires
Meiruz Dec 7, 2023
35ddff9
Subject domains have added for users and desires
Meiruz Dec 7, 2023
380e1e2
Update kb/extra/section_subject_domain_of_desires/section_subject_dom…
Meiruz Dec 13, 2023
1f4d829
Update kb/extra/section_subject_domain_of_desires/section_subject_dom…
Meiruz Dec 13, 2023
c834209
Last version of project
Meiruz Dec 13, 2023
b825be7
Merge pull request #7 from Meiruz/new_adaptive_interface
Meiruz Dec 13, 2023
5d1e3fa
(FIX) infrastructure
Meiruz Dec 14, 2023
aebcf2b
(FIX) Infrastructure
Meiruz Dec 14, 2023
aabc2aa
Base of users width desires.
Meiruz Dec 15, 2023
5d7d3b6
Cities
Meiruz Dec 18, 2023
4cba5ee
Merge branch 'main' into last_version
Meiruz Dec 18, 2023
8de004b
(FIX) Knowledge Base
Meiruz Dec 18, 2023
9a121ef
Starting cities
Meiruz Dec 19, 2023
7a7a9fd
a
Meiruz Dec 22, 2023
585f61f
Authorise and Register Agents error
Meiruz Dec 23, 2023
4a093be
Error has been solved, but agent dont work.
Meiruz Dec 27, 2023
77f6b1f
(FIX) AuthoriseAgent and TravellingAgent
Meiruz Dec 30, 2023
fbbfd11
(FIX) TravellingAgent
Meiruz Dec 30, 2023
7897769
Added FindMetroStationAgent
Meiruz Dec 30, 2023
bb13409
Last version
Meiruz Jan 3, 2024
c6a12a9
(FIX) Agents History and Random
Meiruz Jan 4, 2024
fdb7eee
Merto_Sattions
Meiruz Jan 4, 2024
2df266c
Peace of Moskouskaja line.
Meiruz Jan 6, 2024
03f34a2
(FIX) FindMetroStationAgent
Meiruz Jan 9, 2024
0995b5f
GitIgnore
Meiruz Jan 9, 2024
952abba
Saved last changes
Meiruz Jan 13, 2024
1889123
Start Interface. Intro.
Meiruz Jan 14, 2024
e40e5f2
Intro. Add styles.
Meiruz Jan 14, 2024
b4f1155
Intro. Error with update of changes.
Meiruz Jan 14, 2024
fb1cddb
Makek authorise
Meiruz Jan 15, 2024
5108027
IDK
Meiruz Jan 16, 2024
9128caf
Some changes
Meiruz Jan 16, 2024
5e7d57d
Created Intro Interface
Meiruz Jan 17, 2024
3851e63
Creating of Register Interface
Meiruz Jan 17, 2024
19d64ce
Creating Lodin Interface, but we need to create login function.
Meiruz Jan 19, 2024
8775f91
Created Registration and Authorisation but we need to fix cookie
Meiruz Jan 20, 2024
d86a834
Auth: fixed cookies, but i need to update return
Meiruz Jan 20, 2024
d1db4c7
Had Created Login with Registration. Start of HomePage.
Meiruz Jan 23, 2024
e81c59a
HomePage creating. End of creating login and regist interfaces.
Meiruz Jan 25, 2024
0b160f9
Start send user to agent.
Meiruz Jan 25, 2024
d936d2b
Start settings interface
Meiruz Jan 29, 2024
b00f4c2
Nothing hot update error
Meiruz Jan 29, 2024
9f36388
Start saving of settings
Meiruz Jan 31, 2024
dd4ecbc
Start creation of map.
Meiruz Feb 1, 2024
abe86f7
New API
Meiruz Feb 1, 2024
d7f8f38
Created map. Error with saving maps.
Meiruz Feb 2, 2024
7d191af
b
nepalette Feb 2, 2024
a951bce
Merge pull request #11 from Meiruz/Map
Meiruz Feb 2, 2024
298ca99
update Minsk region
nepalette Feb 2, 2024
3f4a273
Merge branch 'Interface' of https://github.com/Meiruz/nika into Inter…
nepalette Feb 2, 2024
b874c86
Save
Meiruz Feb 2, 2024
34f5d66
add Vitebsk region
nepalette Feb 2, 2024
fe3a6cd
add Brest, Gomel, Grodno, Mogilev region
nepalette Feb 2, 2024
4c18b42
add zel, avt lines
nepalette Feb 2, 2024
aca9812
Map developing
Meiruz Feb 2, 2024
87b4020
update сties
nepalette Feb 2, 2024
31b1d87
update Minsk region
nepalette Feb 3, 2024
1079c55
Created maps
Meiruz Feb 3, 2024
6384ef7
Update accommodations
nepalette Feb 3, 2024
3d19260
Update interesting places
nepalette Feb 3, 2024
de79d57
Merge branch 'Interface' into Map
Meiruz Feb 3, 2024
fce2aac
Merge branch 'Interface' into Map
Meiruz Feb 3, 2024
071d7ed
Fixed bags and errors
Meiruz Feb 4, 2024
a30a77c
Change theme
Meiruz Feb 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ __pycache__
sc-server.log

.DS_Store

problem-solver/py/venv
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ project(nika)
set(NIKA_ROOT ${CMAKE_CURRENT_LIST_DIR})
cmake_minimum_required(VERSION 2.8.12)

set(CMAKE_BUILD_TYPE Debug)
set(PROBLEM_SOLVER_PATH "${CMAKE_CURRENT_LIST_DIR}/problem-solver")
set(SC_MACHINE_PATH "${PROBLEM_SOLVER_PATH}/sc-machine")
include("${SC_MACHINE_PATH}/CMakeLists.txt")
Expand Down
34 changes: 34 additions & 0 deletions interface/interface_authorise/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Login</title>
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="circle"></div>
<div class="circle1"></div>
<div class="wrapper">
<div class="wrapper_content">
<form action="#" id="form">
<h2 style="font-weight: 900; padding: 20px 0 10px 0;">Авторизация</h2>
<input type="email" name="email" id="name" placeholder="E-mail" required>
<input type="password" name="pass" id="pass" placeholder="Пароль" required>
<button type="submit" id="submit">Войти</button>
</form>
</div>
</div>

<script>
l1 = document.querySelector('.circle1')
l2 = document.querySelector('.circle')
document.addEventListener('mousemove', (e) => {
x = e.clientX
y = e.clientY


})
</script>
</body>
</html>
89 changes: 89 additions & 0 deletions interface/interface_authorise/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;700;800;900&display=swap');

* {
margin: 0;
padding: 0;
transition: all .6s ease;
font-family: 'Montserrat';
}

body {
background: #101514;
overflow: hidden;
}

.circle {
position: absolute;
bottom: -20%;
right: -5%;
height: 80vmin;
width: 80vmin;
border-radius: 50%;
background: #538689;
}

.circle1 {
position: absolute;
top: 20%;
left: 5%;
height: 20vmin;
width: 20vmin;
border-radius: 50%;
background: #538689;
}

.wrapper {
display: flex;
justify-content: center;
align-items: center;
position: relative;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
backdrop-filter: blur(100px);
}

.wrapper_content {
display: block;
background: #ebfeff62;
color: white;
text-align: center;
border-radius: 20px;
width: 450px;
padding: 20px;
backdrop-filter: blur(100px);
}

#form {
display: flex;
flex-direction: column;
align-items: center;
gap: 10px;
color: white;
padding: 20px 0;
}

#form input {
width: calc(100% - 30px);
border: none;
border-radius: 10px;
outline: none;
background: #333436;
padding: 15px 10px;
color: white;
font-weight: 700;
font-size: 14px;
}

#submit {
padding: 15px 20px;
outline: none;
border-radius: 10px;
cursor: pointer;
font-weight: 900;
background: #1b3132;
color: white;
font-size: 14px;
border: none;
}
Loading