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

Sign #3

Open
wants to merge 90 commits into
base: sandun
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
1466479
Get Events by date
piyumaldk Jul 4, 2020
b9e12b5
Event Calendar Admin Side
piyumaldk Jul 8, 2020
789833e
Details UI
piyumaldk Jul 8, 2020
a11c26c
Update UIs
piyumaldk Jul 8, 2020
a8fbf0d
Add icons to fields
piyumaldk Jul 8, 2020
910d6cb
Pubsec update
piyumaldk Jul 12, 2020
11aaa7d
Merge branch 'piyumal'
piyumaldk Jul 12, 2020
4fbbe0f
Pubsec update 2
piyumaldk Jul 12, 2020
ac59209
Pubsec update 3
piyumaldk Jul 12, 2020
ab8dcae
Merge branch 'master' into piyumal
piyumaldk Jul 12, 2020
6da5aac
User management ui
sakuni24 May 30, 2020
b498bb7
Sign In Final
tharakasandun Jul 12, 2020
7956cb4
splash
tharakasandun Jul 21, 2020
2fa1f82
Photo Uploading UI complete
tharakasandun Jul 22, 2020
b5d6b80
View my upload pic complete
tharakasandun Jul 27, 2020
863e363
pic gallery
tharakasandun Aug 1, 2020
4b01529
email validation error fix
tharakasandun Aug 1, 2020
d4536e8
admin login route
tharakasandun Aug 2, 2020
e936b25
Merge
piyumaldk Aug 6, 2020
bc3b108
Merge branch 'master' of https://github.com/Group40/SandT_Group
piyumaldk Aug 6, 2020
fc6acd2
Upcoming events
piyumaldk Aug 6, 2020
a02d986
Event publish Admin drawer
piyumaldk Aug 6, 2020
468b422
Course list
piyumaldk Aug 6, 2020
4934581
Add course
piyumaldk Aug 6, 2020
519131a
Edit course
piyumaldk Aug 6, 2020
ce6de12
Course admin side 1st iteraction
piyumaldk Aug 6, 2020
c8f3437
Search courses UI
piyumaldk Aug 6, 2020
afdb4c7
search phase
piyumaldk Aug 7, 2020
a63d535
search phase 2
piyumaldk Aug 7, 2020
306c228
Search done
piyumaldk Aug 7, 2020
8266ffd
Age group upgrade
piyumaldk Aug 7, 2020
8bb2e50
Course detail page
piyumaldk Aug 7, 2020
7b1c90a
Age filter
piyumaldk Aug 7, 2020
18cafe8
Filters done
piyumaldk Aug 7, 2020
a20ef0b
Courses UI
piyumaldk Aug 7, 2020
1422e1e
Customer side UI
piyumaldk Aug 7, 2020
9d82ff9
Like phase 1
piyumaldk Aug 8, 2020
133353c
Like phase 2
piyumaldk Aug 8, 2020
a9750f6
Like first iteration done
piyumaldk Aug 8, 2020
483df57
Comment phase 1
piyumaldk Aug 8, 2020
2968273
View Comments
piyumaldk Aug 8, 2020
92f3216
Bug fixed
piyumaldk Aug 8, 2020
4ffd78e
Courses 1st interation done
piyumaldk Aug 8, 2020
80dd7e1
Add Notifications
piyumaldk Aug 9, 2020
cebff1a
View Admin notifications
piyumaldk Aug 9, 2020
47cf18e
Admin notification deleted
piyumaldk Aug 9, 2020
78276be
Admin UI fix
piyumaldk Aug 9, 2020
5e7ccee
UI update 2
piyumaldk Aug 9, 2020
253b48a
Notification view user
piyumaldk Aug 9, 2020
c7a68ba
Loading screen
piyumaldk Aug 9, 2020
526b096
crew member homepage final
tharakasandun Aug 11, 2020
e88c3ac
Crew Member
piyumaldk Aug 19, 2020
5813aff
Search Course Admin side
piyumaldk Aug 19, 2020
a23e984
user home screen
tharakasandun Aug 23, 2020
33730a1
User home page
tharakasandun Aug 23, 2020
1a96a54
admin home screen
tharakasandun Aug 23, 2020
5dc28aa
crew home page
tharakasandun Aug 23, 2020
c635fe8
ui color fix
tharakasandun Aug 23, 2020
031b4dd
Url fixed
piyumaldk Aug 25, 2020
1552e3c
function logic updated
tharakasandun Aug 27, 2020
78fcb35
delete error fix - image
tharakasandun Aug 27, 2020
b452c7e
update password function
tharakasandun Aug 27, 2020
12b0903
aws host test
tharakasandun Aug 28, 2020
0db22ed
user details update fix
tharakasandun Aug 28, 2020
b16048b
Article Handling page
punsaraCP Oct 8, 2020
0c59a4a
Article hoem created
punsaraCP Oct 8, 2020
6e042ce
Youtube icon changed to articlehome page
punsaraCP Oct 8, 2020
82e989f
Single articel
punsaraCP Oct 10, 2020
0ca0185
bottom navi bar error fix
tharakasandun Oct 10, 2020
59281fc
admin error fix
tharakasandun Oct 10, 2020
bfecab8
user management
sakuni24 Oct 11, 2020
a31e5ea
forum and youtube playlist
HasiniKandage Oct 11, 2020
a90021c
forum change
HasiniKandage Oct 11, 2020
ee3bd8b
Done and dusted
punsaraCP Oct 11, 2020
71c959a
sdk/loging error fix
tharakasandun Oct 11, 2020
b2d90ff
fix
tharakasandun Oct 11, 2020
bd7305e
Merge branch 'master' into punsara
punsaraCP Oct 11, 2020
33a2893
Merge pull request #5 from Group40/punsara
punsaraCP Oct 11, 2020
9988761
Merge branch 'master' of https://github.com/Group40/SandT_Group
tharakasandun Oct 11, 2020
db7a969
License
tharakasandun Oct 12, 2020
0da5d33
Bug fixed
piyumaldk Oct 12, 2020
254b009
Bug fixed 2
piyumaldk Oct 12, 2020
c012ca1
Comment fix
piyumaldk Oct 12, 2020
6c89aa4
Sign up text fixed
piyumaldk Oct 12, 2020
f0b8a3b
Crew Grid correction
piyumaldk Oct 12, 2020
bc6a84a
ui fix
tharakasandun Oct 12, 2020
97387b6
Single article page done ,added deleted
punsaraCP Oct 12, 2020
9a4e54d
admin usermanagement
tharakasandun Oct 12, 2020
67fe838
date
HasiniKandage Oct 12, 2020
c97c369
fix
tharakasandun Oct 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ui fix
  • Loading branch information
tharakasandun committed Oct 12, 2020
commit bc6a84a6e44443a339ae8d3f6cb12131fdde9282
7 changes: 7 additions & 0 deletions lib/Photography/AdminFun/ReviewPic.dart
Original file line number Diff line number Diff line change
@@ -110,6 +110,13 @@ class ReviewPicState extends State<ReviewPic> {
backgroundColor: Colors.black,
),
);
} else if (picsurl.length == 0) {
return Center(
child: Text(
"Nothing to review",
style: TextStyle(fontSize: 18),
),
);
} else {
return Container(
child: GridView.builder(
100 changes: 74 additions & 26 deletions lib/Photography/AdminFun/ViewScreenAdmin.dart
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ import 'package:shimmer/shimmer.dart';

import '../PicGallery.dart';

var notificationUrl = getUrl() + "/addNotification";

class ViewScreenAdmin extends StatefulWidget {
final String picurl;
final bool ismypic;
@@ -77,6 +79,29 @@ class _ViewScreenAdminState extends State<ViewScreenAdmin> {
}
}

Future<String> confirmPicReport() async {
var notificationBody = jsonEncode({
'authorName': getUsername(),
'authorType': getrole(),
'authorMail': getEmail(),
'name': title,
'nameType': "confirmed the photo",
'date': DateTime.now().toString(),
});
return http.post(notificationUrl, body: notificationBody, headers: {
"Accept": "application/json",
"content-type": "application/json"
}).then((dynamic res) {
setState(() {
_btnstateconfirm = false;
});
Navigator.of(context).pop();
Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) {
return ReviewPic();
}));
});
}

Future<String> confirmPic() async {
String senturl = getUrl() + '/picreviewed/' + picid;
try {
@@ -88,15 +113,7 @@ class _ViewScreenAdminState extends State<ViewScreenAdmin> {
},
);
if (response.statusCode == 200) {
setState(() {
_btnstateconfirm = false;

});
Navigator.of(context).pop();
Navigator.pushReplacement(context,
MaterialPageRoute(builder: (context) {
return ReviewPic();
}));
confirmPicReport();
} else {
_showNetErrorDialog("Somjething went wrong ");
return null;
@@ -107,6 +124,29 @@ class _ViewScreenAdminState extends State<ViewScreenAdmin> {
}
}

Future<String> unreviewePicReport() async {
var notificationBody = jsonEncode({
'authorName': getUsername(),
'authorType': getrole(),
'authorMail': getEmail(),
'name': title,
'nameType': "unreview photo",
'date': DateTime.now().toString(),
});
return http.post(notificationUrl, body: notificationBody, headers: {
"Accept": "application/json",
"content-type": "application/json"
}).then((dynamic res) {
setState(() {
_btnstatedelete = false;
});
Navigator.of(context).pop();
Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) {
return PicGallery();
}));
});
}

Future<String> unreviewePic() async {
String senturl = getUrl() + '/picunreviewed/' + picid;
try {
@@ -118,14 +158,7 @@ class _ViewScreenAdminState extends State<ViewScreenAdmin> {
},
);
if (response.statusCode == 200) {
setState(() {
_btnstatedelete = false;
});
Navigator.of(context).pop();
Navigator.pushReplacement(context,
MaterialPageRoute(builder: (context) {
return PicGallery();
}));
unreviewePicReport();
} else {
_showNetErrorDialog("Somjething went wrong ");
return null;
@@ -136,6 +169,29 @@ class _ViewScreenAdminState extends State<ViewScreenAdmin> {
}
}

Future<String> deletReport() async {
var notificationBody = jsonEncode({
'authorName': getUsername(),
'authorType': getrole(),
'authorMail': getEmail(),
'name': title,
'nameType': "deleted photo",
'date': DateTime.now().toString(),
});
return http.post(notificationUrl, body: notificationBody, headers: {
"Accept": "application/json",
"content-type": "application/json"
}).then((dynamic res) {
setState(() {
_btnstatedelete = false;
});
Navigator.of(context).pop();
Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) {
return PicGallery();
}));
});
}

Future<String> deletePic() async {
String senturl = getUrl() + '/deletepic/' + picid;
try {
@@ -147,14 +203,7 @@ class _ViewScreenAdminState extends State<ViewScreenAdmin> {
},
);
if (response.statusCode == 200) {
setState(() {
_btnstatedelete = false;
});
Navigator.of(context).pop();
Navigator.pushReplacement(context,
MaterialPageRoute(builder: (context) {
return ReviewPic();
}));
deletReport();
} else {
_showNetErrorDialog("Somjething went wrong ");
return null;
@@ -374,7 +423,6 @@ class _ViewScreenAdminState extends State<ViewScreenAdmin> {
if (isdelete) {
deletePic();
} else {

unreviewePic();
}
});
7 changes: 5 additions & 2 deletions lib/Photography/PicGallery.dart
Original file line number Diff line number Diff line change
@@ -242,9 +242,12 @@ class DataSerch extends SearchDelegate<String> {
"sun",
"moon",
"mars",
"test",
"title",
"star",
"polaris",
"starship",
"sirius",
"milky way"
"galaxy"
];
final recent = [];
PicGallery picGallery;
169 changes: 169 additions & 0 deletions lib/Photography/UploadPics.dart
Original file line number Diff line number Diff line change
@@ -21,12 +21,16 @@ class UploadPics extends StatefulWidget {
class UploadPicsState extends State<UploadPics> {
TextEditingController titleController = TextEditingController();
TextEditingController descrptController = TextEditingController();
TextEditingController townController = TextEditingController();
TextEditingController districController = TextEditingController();
TextEditingController dateController = TextEditingController();

File _image;
int _state = 0;
bool _validatetitle = true;
bool _validatedis = true;
bool _picvalidate = false;
DateTime _dateTime = DateTime.now();

@override
void dispose() {
@@ -48,6 +52,9 @@ class UploadPicsState extends State<UploadPics> {
request.fields['email'] = getEmail();
request.fields['title'] = titleController.text;
request.fields['detail'] = descrptController.text;
request.fields['town'] = townController.text;
request.fields['distric'] = districController.text;
request.fields['date'] = dateController.text;
request.fields['name'] = getUsername();
request.files.add(multipartFile);
//var response = await request.send()
@@ -180,6 +187,159 @@ class UploadPicsState extends State<UploadPics> {
)),
),
),
Padding(
padding: EdgeInsets.only(top: 15.0, bottom: 10.0),
child: TextFormField(
controller: townController,
onChanged: (value) {
setState(() {
_validatetitle = true;
});
},
style: TextStyle(
color: Theme.of(context).primaryColor,
),
decoration: InputDecoration(
errorText: _validatetitle ? null : 'Town Can\'t Be Empty',
labelText: 'Capture Town',
prefixIcon: Padding(
padding: EdgeInsets.only(top: 0),
child: Icon(
FontAwesomeIcons.home,
color: Theme.of(context).primaryColor,
),
),
labelStyle: TextStyle(
color: Theme.of(context).primaryColor,
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context).primaryColor, width: 2.0),
borderRadius: BorderRadius.circular(35.0),
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(35.0),
)),
),
),
Padding(
padding: EdgeInsets.only(top: 15.0, bottom: 10.0),
child: TextFormField(
controller: districController,
onChanged: (value) {
setState(() {
_validatetitle = true;
});
},
style: TextStyle(
color: Theme.of(context).primaryColor,
),
decoration: InputDecoration(
errorText:
_validatetitle ? null : 'Distric Can\'t Be Empty',
labelText: 'Capture Distric',
prefixIcon: Padding(
padding: EdgeInsets.only(top: 0),
child: Icon(
Icons.location_on,
color: Theme.of(context).primaryColor,
),
),
labelStyle: TextStyle(
color: Theme.of(context).primaryColor,
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context).primaryColor, width: 2.0),
borderRadius: BorderRadius.circular(35.0),
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(35.0),
)),
),
),
Padding(
padding: EdgeInsets.only(top: 15.0, bottom: 15.0),
child: Row(
children: <Widget>[
//Date Field
Expanded(
child: TextFormField(
enabled: false,
controller: dateController
..text = _dateTime.toString().substring(0, 10),
validator: (String value) {
if (value.isEmpty) {
return 'Please enter the date';
}
return null;
},
style: TextStyle(
color: Theme.of(context).primaryColor,
),
onChanged: (value) {
//debugPrint('Something changed in Text Field');
},
decoration: InputDecoration(
labelText: 'Date',
prefixIcon: Padding(
padding: EdgeInsets.only(top: 0),
// add padding to adjust icon
child: Icon(
Icons.date_range,
color: Theme.of(context).primaryColor,
),
),
labelStyle: TextStyle(
color: Theme.of(context).primaryColor,
),
disabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context).accentColor,
width: 0.0),
borderRadius: BorderRadius.circular(35.0),
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(35.0),
)),
),
),
Container(
width: 5.0,
),

//Calendar Button
Expanded(
child: ButtonTheme(
child: RaisedButton(
color: Theme.of(context).accentColor,
child: Text(
'Select Captured date',
style: TextStyle(
color: Theme.of(context).primaryColor,
),
),
onPressed: () {
showDatePicker(
context: context,
initialDate: DateTime.now(),
firstDate: DateTime(2001),
lastDate: DateTime(2222),
).then((date) => {
setState(() {
if (date == null) {
date = DateTime.now();
}
_dateTime = date;
}),
});
},
),
),
),
],
),
),
Padding(
padding: EdgeInsets.only(top: 15.0, bottom: 10.0),
child: TextFormField(
@@ -237,6 +397,15 @@ class UploadPicsState extends State<UploadPics> {
(descrptController.text.isEmpty)
? _validatedis = false
: _validatedis = true;
(townController.text.isEmpty)
? _validatedis = false
: _validatedis = true;
(districController.text.isEmpty)
? _validatedis = false
: _validatedis = true;
(dateController.text.isEmpty)
? _validatedis = false
: _validatedis = true;
});
if ((_validatetitle == true) &&
(_validatedis == true)) {
2 changes: 1 addition & 1 deletion lib/SignUpLogIn/AuthScreen.dart
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ class _AuthScreenState extends State<AuthScreen> {
child: Align(
alignment: Alignment(0, -MediaQuery.of(context).size.height / 1100),
child: new Text(
"APP_NAME",
"altair",
style: TextStyle(
fontSize: 40,
color: Colors.white,
Loading