Merge pull request #50 from ACM-JUIT/Dev-Aditya

Councils Updated

lib/Screens/Community/ACM/acm_descrption.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:omnia/Resources/Theme/theme.dart';
 import 'package:omnia/Screens/Community/ACM/Sessions/session.dart';
 import 'package:omnia/Resources/widget_tiles.dart';
+import 'package:omnia/Screens/Community/Council/oldcouncil.dart';
 
 class ACMDetailsPage extends StatefulWidget {
   final String heading;
@@ -146,6 +147,92 @@ class _ACMDetailsPageState extends State<ACMDetailsPage> {
                                       ],
                                     ),
                                   ),
+
+
+                                ],
+                              ),
+                            ),
+                          ),
+                        ),
+
+                        GestureDetector(
+                          onTap: () {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(builder: (context) => const OldCouncil()),
+                            );
+                          },
+                          child: Padding(
+                            padding: const EdgeInsets.all(8.0),
+                            child: Container(
+                              decoration: BoxDecoration(
+                                gradient: const LinearGradient(
+                                  colors: [
+                                    gradientColor2,
+                                    gradientColor1,
+                                  ],
+                                ),
+                                border: Border.all(color: itemColor, width: 0.6),
+                                borderRadius: BorderRadius.circular(10),
+                                color: cardColor,
+                              ),
+                              height: 120,
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.end,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Expanded(
+                                    child: Stack(
+                                      children: [
+                                        ClipRRect(
+                                          borderRadius: BorderRadius.circular(10.0),
+                                          child: Image.asset(
+                                            "assets/council/oldcouncil.jpg",
+                                            // alignment: Alignment.center,
+                                            fit: BoxFit.cover,
+                                            width: double.infinity,
+                                            height: double.infinity,
+                                          ),
+                                        ),
+                                        ClipRRect(
+                                          borderRadius: BorderRadius.circular(10.0),
+                                          child: BackdropFilter(
+                                            filter: ImageFilter.blur(sigmaX: 4.0, sigmaY: 4.0),
+                                            child: Container(
+                                              color: Colors.black.withOpacity(0.3),
+                                              width: double.infinity,
+                                              height: double.infinity,
+                                            ),
+                                          ),
+                                        ),
+                                        const Padding(
+                                          padding: EdgeInsets.all(12.0),
+                                          child: Column(
+                                            mainAxisAlignment: MainAxisAlignment.end,
+                                            crossAxisAlignment: CrossAxisAlignment.start,
+                                            children: [
+                                              Text(
+                                                "2023-2024",
+                                                style: TextStyle(
+                                                  color: Colors.white,
+                                                ),
+                                              ),
+                                              Text(
+                                                "Council Members",
+                                                style: TextStyle(
+                                                  color: Colors.white,
+                                                  fontSize: 18,
+                                                  fontWeight: FontWeight.bold,
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+
+
                                 ],
                               ),
                             ),

lib/Screens/Community/Council/council.dart

@@ -12,6 +12,7 @@ class _CouncilState extends State<Council> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: primaryColor,
       body: Container(
         color: navColor,
         child: SingleChildScrollView(
@@ -32,56 +33,57 @@ class _CouncilState extends State<Council> {
               // Custom card 1
               _buildCard(
                 context: context,
-                heading: 'Ritwija Deep',
+                heading: 'Animesh Singh',
                 subheading: 'Chairperson',
-                imagePath: 'assets/profile1.png',
-                description: 'Led the community with strategic vision and guidance, overseeing all activities and ensuring alignment with ACM-JUIT’s goals.',
+                imagePath: 'assets/council/chair.png',
+                description: '"You know who I am"',
               ),
               // Custom card 2
               _buildCard(
                 context: context,
-                heading: 'Shashank Singh',
+                heading: 'Zama Rizvi',
                 subheading: 'Vice Chairperson',
-                imagePath: 'assets/profile2.png',
-                description: 'Assisted in managing the community’s operations and played a key role in implementing initiatives and coordinating events.',
+                imagePath: 'assets/council/vice.jpg',
+                description: 'Master of Organized Chaos, Expert in Turning Coffee into Code , ensuring meetings are as smooth as your last code compilation and the Go-To for keeping the team spinning -- All the while making sure no one forgets the importance of emotional intelligence -- because great tech starts with great people (maybe a few snacks)',
               ),
               // Custom card 3
               _buildCard(
                 context: context,
-                heading: 'Manas Bajpai',
+                heading: 'Aditya Kumar',
                 subheading: 'Webmaster',
-                imagePath: 'assets/profile3.png',
-                description: 'Maintained and updated the community’s online presence, including creating and managing ACM-JUIT’s website and event-specific sites.  ',
+                imagePath: 'assets/council/webmaster.jpg',
+                description: 'Creator and Co-Developer of Omnia \n\n"Council: App-master is not a thing. \n\tMe: Y\'know I\'m something of a Webmaster \n\tmyself."',
+                gif: 'assets/council/rickroll.gif',
               ),
               // Custom card 4
               _buildCard(
                 context: context,
-                heading: 'Vidushi Dwivedi',
+                heading: 'Meghna Mankotia',
                 subheading: 'Treasurer',
-                imagePath: 'assets/profile4.png',
-                description: 'Vidushi Dwivedi is the Treasurer, responsible for managing the council\'s finances.',
+                imagePath: 'assets/council/treasurer.jpg',
+                description: 'Life is not a waste of time, time is not a waste of life. So let\'s not waste any time, get wasted and have the time of our lives. \n"Party budget TBD"',
               ),
               // Custom card 5
               _buildCard(
                 context: context,
-                heading: 'Yatharth',
+                heading: 'Kartikey Srivastava',
                 subheading: 'Secretary',
-                imagePath: 'assets/profile5.png',
-                description: 'Handled documentation, meeting notes, and internal communications, ensuring organized and efficient management of community activities.',
+                imagePath: 'assets/council/secretary.jpg',
+                description: 'Creator and co-developer of Omnia, \nCR3 ki permission chahiye? Miljayegi \nEvents ki attendance chahiye? Hojaegi \nVc se budget approval? Samjho hogaya, coz \nSecretary always 🔛🔝',
               ),
               _buildCard(
                 context: context,
-                heading: 'Nikhilesh',
+                heading: 'Norin Sharma',
                 subheading: 'Membership Chair',
-                imagePath: 'assets/profile1.png',
-                description: 'Oversaw member recruitment, retention, and engagement, working to grow and support the community’s membership base.',
+                imagePath: 'assets/council/memchair.jpg',
+                description: 'I can strike up a conversation with anyone—even a houseplant! With a sixth sense for spotting potential members who just need a little nudge to join the fun, I’ll be the mastermind behind growing our club, turning casual visitors into committed members with my irresistible charm and creativity.',
               ),
               _buildCard(
                 context: context,
-                heading: 'Vidhi Jaiswal',
+                heading: 'Kanika Thakur',
                 subheading: 'Creative Head',
-                imagePath: 'assets/profile2.png',
-                description: 'Directed creative efforts, including event branding, content creation, and design, to enhance the community’s visual and thematic appeal.',
+                imagePath: 'assets/council/design.jpg',
+                description: 'Brainstorming Wizard. \nMaster of Memes. \nArtistic force behind every cool poster. \nMotto of our council \n"Kanika Sambhal Legi"',
               ),
             ],
           ),
@@ -96,26 +98,28 @@ class _CouncilState extends State<Council> {
     required String subheading,
     required String imagePath,
     required String description,
+    String? gif,
   }) {
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: Card(
         child: ListTile(
+
           title: Text(heading),
           subtitle: Text(subheading),
           leading: CircleAvatar(
             backgroundImage: AssetImage(imagePath),
           ),
           onTap: () {
-            _showDescriptionDialog(context, heading, subheading, description);
+            _showDescriptionDialog(context, heading, subheading, description, imagePath, gif);
           },
         ),
       ),
     );
   }
 
   void _showDescriptionDialog(
-    BuildContext context, String heading, String subheading, String description) {
+  BuildContext context, String heading, String subheading, String description, String imagePath, String? gif) {
   showDialog(
     context: context,
     builder: (BuildContext context) {
@@ -134,24 +138,43 @@ class _CouncilState extends State<Council> {
           ),
         ),
         content: SingleChildScrollView(
-          child: ListBody(
-            children: <Widget>[
-              Text(
-                'Position: $subheading',
-                style: const TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.w600,
-                  color: Colors.black54,
-                ),
-              ),
-              const SizedBox(height: 10),
-              Text(
-                description,
-                style: const TextStyle(
-                  fontSize: 14,
+          child: Column(
+            children: [
+              Container(
+                height: 120, 
+                width: 120,
+                decoration: BoxDecoration(
+                  image: DecorationImage(
+                    image: AssetImage(imagePath),
+                    fit: BoxFit.fill
+                  ),
                   color: Colors.black87,
+                  borderRadius: BorderRadius.circular(40)
                 ),
               ),
+              ListBody(
+                children: <Widget>[
+                  const SizedBox(height: 10,),
+                  Text(
+                    'Position: $subheading',
+                    style: const TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                      color: Colors.black54,
+                    ),
+                  ),
+                  const SizedBox(height: 10),
+                  Text(
+                    description,
+                    style: const TextStyle(
+                      fontSize: 14,
+                      color: Colors.black87,
+                    ),
+                  ),
+                  if (gif != null) // Only add this if gif is not null
+                    Image.asset(gif, height: 30),
+                ],
+              ),
             ],
           ),
         ),
@@ -173,4 +196,5 @@ class _CouncilState extends State<Council> {
   );
 }
 
+
 }